Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 10 Jan 2012 06:21:19 +0000 (22:21 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 10 Jan 2012 06:21:19 +0000 (22:21 -0800)
commita7ed49a0fddf633a0c09315fbd8ad14c285f52c7
tree4d43962b70ac56b29d6556c02a9036e8851a3969
parent01eeea4386a88419e4606457e837f5ec4becc795
parenta3d2a905ca6b55466397d1c5ac2153f68144512d
Merge from trunk.